bootstrap: make copying linker binaries conditional #116365

P1n3appl3 · 2023-10-02T23:53:09Z

The change in #116276 breaks bootstrapping if you don't use lld for linking with your stage0 compiler. Making this copy conditional should be enough to fix it.

rustbot · 2023-10-02T23:53:16Z

r? @clubby789

(rustbot has picked a reviewer for you, use r? to override)

tmandry · 2023-10-02T23:58:32Z

r? onur-ozkan

lqd · 2023-10-03T00:12:14Z

Let's wait and see what Onur says, but use-lld is (mostly, until #116278) about system lld and not rust-lld. Checking whether src_sysroot_bin exists could also be enough.

onur-ozkan

r=me with or without the suggestion fix.

src/bootstrap/compile.rs

onur-ozkan · 2023-10-03T19:00:01Z

@bors r+

bors · 2023-10-03T19:00:04Z

📌 Commit f55c879 has been approved by onur-ozkan

It is now in the queue for this repository.

tmandry · 2023-10-03T23:00:44Z

@bors rollup

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#115961 (Replace 'mutex' with 'lock' in RwLock documentation) - rust-lang#116146 (Clarify `arg` and `args` documentation) - rust-lang#116363 (Adapt `todo!` documentation to mention displaying custom values) - rust-lang#116365 (bootstrap: make copying linker binaries conditional) - rust-lang#116388 (rustdoc: fix & clean up handling of cross-crate higher-ranked parameters) - rust-lang#116393 (Emit feature gate *warning* for `auto` traits pre-expansion) - rust-lang#116395 (Mark myself as vacation or whatever) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#116365 - P1n3appl3:master, r=onur-ozkan bootstrap: make copying linker binaries conditional The change in rust-lang#116276 breaks bootstrapping if you don't use `lld` for linking with your stage0 compiler. Making this copy conditional should be enough to fix it.

tmandry · 2023-10-04T19:05:52Z

Nominating for beta backport, because #116276 prevents us from building a new compiler.

@rustbot label beta-nominated

lqd · 2023-10-04T20:50:52Z

I may be misunderstanding, but #116276 is not on beta yet, right?

tmandry · 2023-10-04T21:27:39Z

@lqd Thanks and sorry, I mixed it up with the other breakage in #116127

@rustbot label -beta-nominated

rustbot assigned clubby789 Oct 2, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Oct 2, 2023

tmandry requested review from onur-ozkan and lqd October 2, 2023 23:56

tmandry mentioned this pull request Oct 2, 2023

bootstrap: copy self-contained linking components to stage0-sysroot #116276

Merged

rustbot assigned onur-ozkan and unassigned clubby789 Oct 2, 2023

P1n3appl3 force-pushed the master branch from a9a8468 to 0eb298a Compare October 3, 2023 00:30

onur-ozkan reviewed Oct 3, 2023

View reviewed changes

src/bootstrap/compile.rs Outdated Show resolved Hide resolved

bootstrap: make copying linker binaries conditional

f55c879

P1n3appl3 force-pushed the master branch from 0eb298a to f55c879 Compare October 3, 2023 18:25

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 3, 2023

matthiaskrgr mentioned this pull request Oct 4, 2023

Rollup of 7 pull requests #116408

Merged

bors merged commit e6a9bb1 into rust-lang:master Oct 4, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 4, 2023

rustbot added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 4, 2023

pvdrz mentioned this pull request Oct 4, 2023

Fix divergence from upstream master ferrocene/ferrocene#23

Merged

rustbot removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 4, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bootstrap: make copying linker binaries conditional #116365

bootstrap: make copying linker binaries conditional #116365

P1n3appl3 commented Oct 2, 2023

rustbot commented Oct 2, 2023

tmandry commented Oct 2, 2023

lqd commented Oct 3, 2023

onur-ozkan left a comment

onur-ozkan commented Oct 3, 2023

bors commented Oct 3, 2023

tmandry commented Oct 3, 2023

tmandry commented Oct 4, 2023

lqd commented Oct 4, 2023 •

edited

Loading

tmandry commented Oct 4, 2023 •

edited

Loading

bootstrap: make copying linker binaries conditional #116365

bootstrap: make copying linker binaries conditional #116365

Conversation

P1n3appl3 commented Oct 2, 2023

rustbot commented Oct 2, 2023

tmandry commented Oct 2, 2023

lqd commented Oct 3, 2023

onur-ozkan left a comment

Choose a reason for hiding this comment

onur-ozkan commented Oct 3, 2023

bors commented Oct 3, 2023

tmandry commented Oct 3, 2023

tmandry commented Oct 4, 2023

lqd commented Oct 4, 2023 • edited Loading

tmandry commented Oct 4, 2023 • edited Loading

lqd commented Oct 4, 2023 •

edited

Loading

tmandry commented Oct 4, 2023 •

edited

Loading